gtkplacessidebar: Remove deprecated "show-other-locations" signal
authorRico Tzschichholz <ricotz@ubuntu.com>
Sun, 23 Oct 2016 16:46:24 +0000 (18:46 +0200)
committerRico Tzschichholz <ricotz@ubuntu.com>
Sun, 23 Oct 2016 17:13:15 +0000 (19:13 +0200)
gtk/gtkplacessidebar.c

index 4ab7778be56a495cfac012690598aa2302af7d19..33b3ded42b1dc575df435adab38c1efb36ac5eee 100644 (file)
@@ -203,8 +203,6 @@ struct _GtkPlacesSidebarClass {
                                       GdkDragAction       action);
   void    (* show_enter_location)    (GtkPlacesSidebar   *sidebar);
 
-  void    (* show_other_locations)   (GtkPlacesSidebar   *sidebar);
-
   void    (* show_other_locations_with_flags)   (GtkPlacesSidebar   *sidebar,
                                                  GtkPlacesOpenFlags  open_flags);
 
@@ -222,7 +220,6 @@ enum {
   DRAG_ACTION_REQUESTED,
   DRAG_ACTION_ASK,
   DRAG_PERFORM_DROP,
-  SHOW_OTHER_LOCATIONS,
   SHOW_OTHER_LOCATIONS_WITH_FLAGS,
   MOUNT,
   UNMOUNT,
@@ -335,12 +332,6 @@ emit_show_enter_location (GtkPlacesSidebar *sidebar)
   g_signal_emit (sidebar, places_sidebar_signals[SHOW_ENTER_LOCATION], 0);
 }
 
-static void
-emit_show_other_locations (GtkPlacesSidebar *sidebar)
-{
-  g_signal_emit (sidebar, places_sidebar_signals[SHOW_OTHER_LOCATIONS], 0);
-}
-
 static void
 emit_show_other_locations_with_flags (GtkPlacesSidebar   *sidebar,
                                       GtkPlacesOpenFlags  open_flags)
@@ -2320,7 +2311,6 @@ open_row (GtkSidebarRow      *row,
 
   if (place_type == PLACES_OTHER_LOCATIONS)
     {
-      emit_show_other_locations (sidebar);
       emit_show_other_locations_with_flags (sidebar, open_flags);
     }
   else if (uri != NULL)
@@ -4293,31 +4283,6 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class)
                         G_TYPE_POINTER, /* GList of GFile */
                         G_TYPE_INT);
 
-  /**
-   * GtkPlacesSidebar::show-other-locations:
-   * @sidebar: the object which received the signal.
-   *
-   * The places sidebar emits this signal when it needs the calling
-   * application to present a way to show other locations e.g. drives
-   * and network access points.
-   * For example, the application may bring up a page showing persistent
-   * volumes and discovered network addresses.
-   *
-   * Deprecated: 3.20: use the #GtkPlacesSidebar::show-other-locations-with-flags
-   * which includes the open flags in order to allow the user to specify to open
-   * in a new tab or window, in a similar way than #GtkPlacesSidebar::open-location
-   *
-   * Since: 3.18
-   */
-  places_sidebar_signals [SHOW_OTHER_LOCATIONS] =
-          g_signal_new (I_("show-other-locations"),
-                        G_OBJECT_CLASS_TYPE (gobject_class),
-                        G_SIGNAL_RUN_FIRST | G_SIGNAL_DEPRECATED,
-                        G_STRUCT_OFFSET (GtkPlacesSidebarClass, show_other_locations),
-                        NULL, NULL,
-                        NULL,
-                        G_TYPE_NONE, 0);
-
   /**
    * GtkPlacesSidebar::show-other-locations-with-flags:
    * @sidebar: the object which received the signal.
@@ -4807,7 +4772,7 @@ gtk_places_sidebar_get_show_enter_location (GtkPlacesSidebar *sidebar)
  * see and interact with drives and network servers directly.
  *
  * If you enable this, you should connect to the
- * #GtkPlacesSidebar::show-other-locations signal.
+ * #GtkPlacesSidebar::show-other-locations-with-flags signal.
  *
  * Since: 3.18
  */